Skip to content

780 vite update dependencies#794

Open
bourgeoa wants to merge 2 commits into
stagingfrom
780-vite-update-dependencies
Open

780 vite update dependencies#794
bourgeoa wants to merge 2 commits into
stagingfrom
780-vite-update-dependencies

Conversation

@bourgeoa

Copy link
Copy Markdown
Contributor

No description provided.

@bourgeoa bourgeoa requested a review from NoelDeMartin June 14, 2026 16:46
@bourgeoa bourgeoa assigned bourgeoa and NoelDeMartin and unassigned bourgeoa Jun 14, 2026
@bourgeoa bourgeoa moved this to In review in SolidOS NLNet UI Jun 14, 2026
@bourgeoa bourgeoa moved this from In review to In progress in SolidOS NLNet UI Jun 14, 2026
@bourgeoa bourgeoa removed the request for review from NoelDeMartin June 14, 2026 17:12
@timea-solid

timea-solid commented Jun 15, 2026

Copy link
Copy Markdown
Member

I am not sure what to make if this PR. It is containing work from other PRs?

@NoelDeMartin

NoelDeMartin commented Jun 15, 2026

Copy link
Copy Markdown
Member

@timea-solid Yes, it was built from my working branch in #787. The commits are displayed as new commits because I rewrote history addressing some feedback before merging the PR. I guess @bourgeoa can cherry-pick his latest commit on top of main now, or reapply the changes, etc. But the last commit in the PR is what we should be looking at. I'll wait until he resolves the conflicts before adding my review though.

@bourgeoa

Copy link
Copy Markdown
Contributor Author

@NoelDeMartin
rebase done
local failing test resolved test/unit/login/login.test.ts
build fails on solid-logic as expected

@NoelDeMartin

Copy link
Copy Markdown
Member

@bourgeoa The rebase didn't work as expected, because you've rebased the branch with my previous commits. If you look at the PR, it says there are 14 new commits but there should only be two (or maybe one, I think I already fixed that test in #796, I guess whichever gets merged first wins xD).

Instead of a rebase, you should cherry-pick or apply your changes from a clean staging checkout. If you have issues doing that let me know and we can jump on a call and I help you do it.

@bourgeoa bourgeoa force-pushed the 780-vite-update-dependencies branch from 1ccdcfa to 66cbb82 Compare June 15, 2026 17:10
@bourgeoa

bourgeoa commented Jun 15, 2026

Copy link
Copy Markdown
Contributor Author

@NoelDeMartin
The issue was with git push

git fetch origin
git reset --hard origin/staging
git cherry-pick fe7f0f57ea468ab7c1494aeaf166b47aeb47d9e4
git push --force-with-lease

I had to fix test test/unit/login/login.test.ts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: In progress

Development

Successfully merging this pull request may close these issues.

3 participants